Removed a duplicate delay accidentally added during code refactor (cherry picked from commit 926db1bd544364a9e4ab61e60bcfbe75e05adf56)