Bug 1019684 - Bustage fix for the bustage fix. r=jandem, a=bustage