#6733 Reapply another fix needed for cookie transmission to occur