Bring back string matching for a bugfix.