Go back to PSR-4