Backed out changeset 7c1e05f847ba (bug 1862159) for causing WakeLock related failures...