Revert "Squashed PA merges"

This reverts commit 3ae164c618ff554b5ca18c7c4634030c6ae6b26b.