Revert PIG-3484 because it breaks unit tests


git-svn-id: https://svn.apache.org/repos/asf/pig/trunk@1527010 13f79535-47bb-0310-9956-ffa450edef68
PIG-3114: Duplicated macro name error when using pigunit

git-svn-id: https://svn.apache.org/repos/asf/pig/trunk@1527070 13f79535-47bb-0310-9956-ffa450edef68