Bug 21753: Update to remove the field from the database