You left/put back deleteFolder in the IMAP account but did not put the comment back in IMAP.  The methods look identical-ish.  I assume we just want to delete it from IMAP again and add a comment here like "XXX this isn't quite right for POP3; address when we expose deleting folders to the UI when we need to create job/operations too." or something.