I'm going to add this back in, so I can merge this and we don't have any functional regressions