Bug 916404 - Bustage fix for esr24. r=smaug, a=bustage