Reverted mbar.py to master.