Apply patch with pathfinder workaround by @prock-fife

We currrently need to support FIFE 0.3.4 still. Fixes #1993