Revert "Merge branch 'convert_global_class_to_define'"

This reverts commit 2191ea8193b007f07b7170d46431850039e874d4, reversing
changes made to 3a060fd011b1ea7642acc08cb9839a46fd5b53c8.