Revert MySQL hacks from 1.0.16, bump to 1.0.17