Hm, yeah. Let's make a decision on this (unrelated) commit, and the cookie code before the next release.