backout bug 1013038 because servo mac builds are fixed.
Merge from default.

--HG--
branch : production