Back out 7d1510d544d9 (bug 836968) on suspicion of causing bug 850547
CLOSED TREE