Revert "Start to port to new-pupa"

This reverts commit f35bd7ecc5d00c2fc0eb6fdf575fc3f6fb79590a.