Revert "Update P and BR stripping code to play nicer with other plugins."

This reverts commit 3f3456eacd810ebd74376caa8d4e59341e24f9dd.