Follow up to r89419: