Makes sense, see the new commit.