@RuudBurger feel free to cherry-pick this one asap...