On hold until https://github.com/modelcontextprotocol/modelcontextprotocol/pull/971 is merged