Revert "Don't need to pass that around..." Yes I do...

This reverts commit d3c5e2e9bfdf667a6583e97a1369961059d8e63f.