Commit

4c1fd6d

Maybe it's not even worth the complication. I am not confident in my ability to submit the change in an elegant way. Have done zero codebase recon.