Bug 861287, fix clang bustage.