Revert "ZS 19/12/14"

This reverts commit 454b6de57f17c9bca35b2ba4413071e50f1ca6ed.