This restores the same behavior we had before e11c02c8, and fixes the whitelist add/remove-from command.
e11c02c8