Revert "Different PHIs and checks around theta boundaries"

This reverts commit f2ec0c8ab18e932b12e2ba7d86159fac7a9a2833.