Revert "PB updates"

This reverts commit 3eca3faa7086525cc05499941c0cc79d4e4dd697.