Revert "p970 fixes", trying a cleaner approach

This reverts commit 17bfba3d7ffb94bf85b79f89ef430a01c8ba56be.