Rolled back to the original dependency loading style