Backout bug 945427 (fe812b06762e) r=bustage
Merge from default

--HG--
branch : production