Revert fix for double-namespacing occuring on class constants
Goal: Make the build green, separate out this issue and handle
it inside a different bug / PR