Somewhat revert registry whitelisting change