This should really be done later in a sperate PR. 1. We don't have proper unit test coverage 2. I still didn't get this right at time of removal 3. I haven't done the jit changes to go along with this.