Yes, please revert to use two steps for now, just in case.