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

this reapplies 208012 and 208002.