Patch Set 1: I would prefer that you didn't submit this

I accidentally uploaded my proposed replacement onto a different change.  See I550f832b9ff7b88ba95c7d774ea18d3e8a602eda for what I think this should be.