Undo this and merge through on the libetpan side.  This is not a part of the MailCore repo