Revert "Walk back commits for unused function parameters - they're still being"