Revert 2d5a609a36fda2810d4e696555ec4d9514767cc8

- Reverting for now, not a good solution. Problem with add_cookie
	unit test code