Can you try attached patch?

default to off, so should be safe?