Revert "Ugly hidden parameter is back!"

This reverts commit 9920e46084377eb5ed774ee97777a14a35914a5b.

It broke binary compatibility...