Is the delay really necessary? I know that it existed in the old code as well but it has a really bad smell and is quite arbitrary.