Adjust the white list matching mechanism and revert some changes.