Merge "Revert "Revert "test: Remove icu cleanup hack"""