Syncing repo with what Mozilla uses in production