Revert commit due to failure on buildbot: error: 'match_combine_or' may not intend to support class template argument deduction This reverts commit b86a06ef.