Merge "Revert "Blacklist test failing on host.""