functionally revert 'fix #4062' (tighter turns don't fully solve the problem)
fix #4119 (WTF typo)