Re-added old load format for backwards compat. Still needs to be tested.