Fixing TRUNK-3834

In our opinion there is no reason to have two different search delays. This should solve the problem described in TRUNK 3438.