Restored old load code