Bug fix from AEAD refactoring for some systems.
Remove unused macro