Fixes #4956 language unit tests pass again