Removed unused variable.
Revert "Removed manually defined variables: these will be passed automatically."

No, they weren't passed...

This reverts commit 485fa25dfe61c873235b9e75a4ba515cf8a2afbb.