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