Revert the removal of 2to3 stuff in r437424
Reported by: Vladimir Krstulja <vlad-fbsd@acheronmedia.com>