Merge "Revert "Blacklist failing test.""