back out 9ece666 removing utf8mb4 hacks, no longer needed