Revert "User::saveOptions() optimization"