back out bug 10253322 jhford rev: 74f415324874

--HG--
branch : production
merge backout of 74f415324874

--HG--
branch : production