Revert "copy working version from paxgen branch"

This reverts commit cdcb13409a8a9e3016dc1f4a6e34bce94ab0a27e.