Attempt to remove travis/phix kludges