This reverts commit 9315a79b11. There is an unfortunate interaction with verifyThenRunCommand
9315a79b11