/cc @edds who might have opinions on this