4d4407ce5a
This reverts commit 8379cc85aa.
This caused some regressions, as this approach doesn't properly handle all
possible arguments.