FIX: Add workaround for Cookie bug.

This patch adds a workaround for the Cookie bug, so that we don't need 3.1+ in
order to test.