revert mysql fixes
Merge branch 'rc.1'