Revert "More changes"

This reverts commit 85cb46acfcd746d7b3ff5909e13e75093b61b931.
Revert "First attempt at making pig compile even with Hive's breakage of backwards compatibility"

This reverts commit 568bfa6e026e697a78a6381c18927e7a5a3b84e1.