revert prior commit. - fringe case needs further testing