Revert changes in BranchClassifier to make sure it always picks the right branch