Re-introduce HPPA fix, upstream fix wasn't complete