Revert 096aecc86d62206ba2bc825be6e99732ed49f001 due to poor special character support