I'm too lazy to make this a Proper Change and it also only fixes it for
the tcp feature flag