Revert "Well, the effect of defer."

This reverts commit f52e28960a8e653d6601bdaabd99bdec4fe725aa.
Maybe it could be simpler.