Fixing a problem where swift clients got a timeout error after 5 seconds.
