Bug 820463 - Revert early-loading changes, r=mdas, a=test-only