Created by: camdencheek
This reverts a couple of commits causing panics in k8s
Depending on unit tests to ensure the reverts are clean.