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