follow-up to r9424