This reverts commit 0ad8f0a6aa. We should not do this here. We should instead sanitize the names at the source.
0ad8f0a6aa