This reverts commit ad364993. Revert this for now so the builds made during the weekend are not so very broken. CCBUG:407375 CCBUG:407665