Backout 26407a874057 for causing Bug 937199.
Backout bug 921991