Revert "Make another ConditionalWait for post-rendearing"