Patch r153892 for PR11861 apparently broke an external project (see PR12493).