I'll move this to a new PR, but since we are adding support for `metrofirefox` here, we are introducing the problem here, that's why I included it in the same PR. Otherwise this PR has broken code.