Revert #167 changes

Thinking about adding a forward for this instead