Bug 951497 - Bustage fix. a=bustage
CLOSED TREE