Merge pull request #2141 from akoeplinger/fix-wrong-disableaot-define