Revert greenmail upgrade