Back out bug 935056 (rev d39a3544a287) on suspicion of causing bug 939980.