Can we get back onto un-patched upstream?

[ash211]

https://github.com/palantir/parquet-mr/blob/master/FORK.md shows that there's a difference in how we resolved PARQUET-686 vs upstream. Looking at history of FORK.md, there were other changes in the past but they've now been removed, so this is possibly the last remaining diff vs upstream.

Is there any way for us to resolve this diff and be able to use unpatched apache/parquet-mr across all our internal codebase? Or will we forever be on this patch due to having data created by the Palantir fork that cannot be read correctly in Apache upstream?