Fix build bustage from 2aa803a9a2af due to previous bad porting. rs=bustage-fix