back out bcf59703dca1 due to bug 1037267.
merge default -> production

--HG--
branch : production