See my comments on the commit.