Revert "modified p2 framework to test for p3"

This reverts commit f56ddaffde960b480eaa1415eb00183bade221e8.