Remove whitelist fix patch, pulled upstream & also slightly incorrect, userCache.a() does not perform a full lookup.