Use old defadvice for 24.3 compatibility