PIG-3650: Fix for PIG-3100 breaks column pruning