follow-up to r9396