Back out 47afb5f53400 (bug 978784) because it's still busted with a clobber
CLOSED TREE
Automatic merge