Merge "Remove libz_current hack."