Revert r220349 to re-instate r220277 with a fix for PR21330 -- quite