follow-up to r7307