Bug 863241 - Fix bustage.