Yes two step is the only way to do this now.