Part one of a pretty serious regression fix...