Fix bustage from bug 822721.