This comment ended up in the wrong place, but it's been addressed @hodgestar