This is something I wanted to do a long time ago but was blocked
by #10618 which is now solved.