Bug 859805 - Fix bustage.