Bug 924791 - Follow-up to fix bustage from 396f4f51ae40. r+a=me