Revert back to our older method of preventing namespace pollution; it works better