Merge "Revert "Blacklist test on host.""