A first pass at #656