This is already working in master – committing a regression test.