follow-up to r9368