Back out 2692ef57acaa (bug 789358) for causing bug 834883