This reverts commit 79fce4dd.

Conflicts:
	configure.in
	download

Change-Id: Ica8691c5ff5d3e70538d029ed33a91621405af94