Bug 1066664 - Bustage follow-up. a=bustage