Revert incorrect zipWith/unzip rule