Reverted unsuccessful fixes for Travis.
Trying to fix the Travis build.