PA: Revert all commits post Halo merge