Undo last attempt and run tests against 5.4

Should have no mysqli-related failures