[#3028] Pushing up questionable fix to get help on it.