Revert "Decorator"

This reverts commit 990e7ef3624ac037a29af896b62f009efd3a4dd2.