Revert optimization since Travis does not like it