Bug 999999 - Fix typo in comment (r=lumpy).
Bug 866150 - Revert TopSitesView cleaup changes from bug 865060. r=bnicholson