Followup to fix bustage caused by bug 967364, rs=bustage-fix.