Yeah this was more of a temp. fix so I could start dev. I can add a `TODO` to this until we figure out a permanent fix. Is this a blocker to merge to VPT branch since I don't think we'll be merging this for 2 weeks with the non-regular release coming up.