The macros don't work because of the mismatching capitalization. (cherry picked from commit 968b57fe)