Followup fix for BZ1018800