Revert PIG-3135 and PIG-3145


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