Revert "Temporarily track test branches"

This reverts commit c0ed643964.