What was this doing and how did adding `decorators` allow us to remove it?  Or were those orthogonal?