Bug 907755 - Followups, r=fitzgen