Back out 29e6539961c3 (bug 935056) for re-causing bug 939980