Revert MySQL hacks from 1.0.16