Another bustage fix... I *did* test this I swear. r=headdesk
Merge bustage fix

--HG--
branch : production