ditto with the command line tool. should live elsewhere, not in core.