Reverting changes from #246

Reverting the changes made in #246 as it broke behavior in an undesired way. I still like the change and we are considering it for 1.0. Before introducing this change again I would like to notify martini users of the change before we land it.