ozhap thank you for asking lars to revert this!

Perhaps something like the following patch is enough? (I'd the default
to be t)