A first pass at #621