Removed in preparation for better rewritten java client