Revert "new hapi payload tap"

This reverts commit 38fcaeaa06b436ba85a6b6b467dc317ba45feabc.