Bug 837323 - Bustage followup; r=me