Merge "get rid of needless use of NONEXISTENT_COOKIE which is simply 0"