TIP 59 patch, unified diff, Version 3