then it's probably a good idea to take the refactoring parts of your commit here (and leave the MozActivity for your commit).

feels strange to first land a version, and rewrite it completely in the following commit.