This is a simple patch for the remote api introduction.