Revert underscore namespace