Merge "Some more blacklisting."