Port bug 1090214 to comm-central, rs=bustage-fix a=bustage-fix