Revert "Fix disabling commands"

This reverts commit bc9d88ab0dff6e293983da3431087287dcf93e22.