Summary: No longer need the hacks :) Removed the TODOs.

Test Plan: jenkins

Reviewers: michelle, oazizi, #engineering, nserrino

Reviewed By: #engineering, nserrino

Differential Revision: https://phab.corp.pixielabs.ai/D2307

GitOrigin-RevId: a4eed59fe5817cac5f9d74a454134de1507902cf