New data shows it's better to use mysql2 anyway, so here goes. Hopefully this will make it finish properly on Travis.