put back my code

Ok, travis is just broken. Back to the version I liked.