Worked around PARQUET-16 to improve Parquet performance