Downgrade to PSR-0