Put back annotation and attachment preservation code.