Fixed bad merge with official upstream repo.