Revert "Fix iterator_adaptor_base/enumerator_iter to allow composition of...

Revert "Fix iterator_adaptor_base/enumerator_iter to allow composition of llvm::enumerate with llvm::make_filter_range"

This reverts commit ba7a6b31.

Post-commit review showed that the fix implemented wasn't correct, and a
more principled fix is possible.