Fixies
for https://github.com/tmeshkova/mozilla-central/pull/6#commitcomment-2521309
for https://github.com/tmeshkova/mozilla-central/pull/6#commitcomment-2521353