Revert to PSR-0