Revert "Optimized round-start loading time"

This reverts commit bb813be5d0ea3f95fb3f95adbce2a9f4e6512aea.