Fix remove_all_users for latest 2.5.x nightly