Follow-up to commit d073a4bd to remove chained steps.