Revert extra exports and Makefile changes for Travis