Recommit r110758 (again) now that the problem has been fixed in r110761