d226783405
This reverts commit 8233610d92.
Too much messy around with blocks to support `before_action` and
`around_action`.