Revert r13507 and r13505, go back to py2 scripts
Authored by: klaussfreire 2013-02-23
Parent: [r13511]
Child: [r13513]