Fixed bug #22800 and removed a redundant macro