Swap ZWNJ back

Swap ZWNJ back for usability.