Hotfix: Messed up rebase, patched paths.

My mistake, I messed up that previous rebase.  Verified this commit works on my end.