Revert "Deal with Travis build error"

This reverts commit 90ef407ebcdea830332caa6cdb5e5f458b4d4db1.

Conflicts:
	configure.ac