apply Ticket #11003: with-hints-13402.diff