Revert base.py to what eldarion uses