Revert lazy-loading to make master work again.