pancsf: port over changes from Boris's new commit

Rather than trying to merge in or rebase on top of the
new commit, include the changes as a separate commit,
as it's easier to see this way what changed.