Revert "WIP decorator"

This reverts commit d956b2687a21335a51cc0cc291d090cdeae9a854.