Revert "Updated main.py match old Bitbucket source"

This reverts commit cc1a76d2ddffe13eb8d97ae994f3e4a13e7012c2.

 Threw back changes to master branch - 2