Backout 80d7ffbceec0
Bug 981166 - Remove Metro registration for all subusers. r=jimm