Revert back to protocolless