Backed out changeset e2360d41bd66 (bug 1033387) for loader test failures