So assuming this is correct, #2968 is moot and most of the changes below too except the regex change to allow -, is that right?