Oy. It was so similar to my own change that I assumed you had just cherry-picked mine, updated a few things, and pushed it back! I didn't realize it was actually a different change. I apologize for assuming this was based on my work. FWIW, my change was I1556b7e7ea21c31ff76bca930269e0cc7d55cd26

I think its stupid to revert this. Lets just make a new commit that fixes some of the comments I made in the post-submit review.