Reverted manual loading changes