Issue 457 - We really should be using the whitelist.