Reverting so that we can have more discussion about the STL API. This reverts commit 91e11c0c. Change-Id: I187fe52f2c16b6e7c5c9d49c42921eb6c7063dba