Revert "-pawitp"

This reverts commit 154b5d81523824eb382d2d0ee66a8ddb25eeb390.