Revert "Merge pull request #1 from sapjax/cn"

This reverts commit f86ede6dffe81b18e8183a9ba79ed965dd8946b5, reversing
changes made to 1c796ecc75d8895f50e65160c53f00a875cb9d2b.
Merge pull request #2 from sapjax/master

Revert "Merge pull request #1 from sapjax/cn"