Bustage fix for Bug 1039003 r=bustage a=me for CLOSED TREE