Backed out changeset 121171dddc5b (bug 890405) for Jetpack test failures

Landed on a CLOSED TREE