Back out bug 819000
Merge backout. a=bustage