Revert Bug 964216

Breaks production builds. See https://bugzilla.mozilla.org/show_bug.cgi?id=964216