Revert "Merge pull request #124 from thedrow/topic/decorators".
I will not merge under the influence again. Promise.

This reverts commit a8b0fb6352283d526bf18601506e9ede01e1748e, reversing
changes made to ac025e6192502dd7e6eaabbe9e02dd4301d5ebce.