Bug 887984 - Bustage fix. a=bustage