Revert "Removed obsolete Ch18"

This reverts commit 5dd71ef09cf194221489b3c63f7a954c4ba02cc0.