Revert to a version of trunk that builds on travis

See https://coq.inria.fr/bugs/show_bug.cgi?id=3452
WIP
WIP
WIP