Factor out broken flag clearing Differential Revision: https://phabricator.services.mozilla.com/D75022