Bug 967337 - Bustage follow-up. r=catlee