Bug 1114825 - Bustage fix. r=bustage.