First pass at #412