Followup to bug 928966, rs=bustage-fix