Downgrade architecture for now