Revert "More PB testing"

This reverts commit 2e06bdeed6134fba63dba4d491b6a3d3e85247df.