Bug 921212 - Bustage fix. a=bustage