Revert step first workflow strategy changes