This hack is no longer necessary because the commands are now totally allowed to fail with no consequences.