Revert #4663 for now. It still breaks the pulltester.

This reverts commit 4975ae17.

Conflicts:
	configure.ac