Tried 4.18-rc2 today, which also fixed the issue for me. Whether it was this fix or some other. ;) Hence closing.