Back out bd91df842f2f (bug 840388)
CLOSED TREE