This is already being passed in via params. This diff should be a no-op... just simplifying the code.

Depends on D6589

Flow, play around with app, tested in combination with following diffs