Categories were still sometimes being set even when the option was disabled.