Revert "Merge pull request #928 from miry/before_with_args"

This reverts commit 55bf5763721906857b7f1b2e141d2645ed1f9193, reversing
changes made to 02b847e040abaeacf972545c088444d9705454c0.
Preparing Release v3.2.1