back out 3fc51abcc61a.
merge default -> production

--HG--
branch : production