I see the commit comment as to why you made this change.

I've struggled with the best way to pass around instance state and admittedly things still aren't perfect.

Going to think about this a bit...