Removed defadvice and fixed mc escape-key