First pass at #447