Revert "P31XX : Switch to test branches"

This reverts commit a590d85815711846879dfcc63d3d429d864580d6.