Followup to 12a7db2