Check the latest code commit for reducing this step.