Prepared for latest, unmodified release from original repo.