Replace refs to deleted email_user_to_address table