Revert refractoring due to delay in loading.