Properly revert attachment renames if they fail. Closes #430