Fix auto disabling

@amanatidis Review and merge. There is a related branch in the `txc` repo, too.

After the merge into devel, I'll merge it with master and tag it with a new version.