Another pass at #474