Bug 1111258 - Bustage fix. r=mstange