Revert the change to the order of events in setReady