This reverts commit b81d4bfb. It's causing some bots to fail to build due to: "error: no matching function for call to ‘__iterator_category".