Original patch did not have these leaks, they were introduced later
during manual applying of the patch.