This mostly revert bug 1616238. Differential Revision: https://phabricator.services.mozilla.com/D113485