Rolling back the bad fix to spot-1850