Prevent 61779 and 61810 from merging into in py3k