RF-12958: scaled back the aggressivenes of the fix for RF-12850