Core/Auras: Restore part of 1845ab79 that was accidentally reverted