Revert "Fix CA selection logic"

This reverts commit 10a64457107462a111148d43b7ca85e2a45383f4.