Revert "These shouldnt be needed now"

This reverts commit d8840bef5d9eb603823739743c618cb85f6d3fc7.