Back out f23136a1fedf (bug 698437) on suspicion of causing multiple Android mochitest failures on a CLOSED TREE