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

Ignore this patch set. Unintentionally I rebased it to an intermediate state of origin/master.
The next patch set will be rebased to the latest origin/master.