Revert "Merge remote-tracking branch 'origin/choice' into cmakeable"

This reverts commit a9454d19b462d6edc0c83c3d4815edd7f8c0561d, reversing
changes made to 80a821af629a2d50f8e8976e644d3f7e72f99d5a.