Revert back to old MySQL driver
Merge branch 'develop'