Created by: ryanslade
We were doing it in two places and it will be useful once we extract P4 related code into its own type.
All tests still pass