Mysql fix 16
Revert "Mysql fix 16"

This reverts commit a310f0430a8a45cbebff59adc1f5b6412f816ba2.
Mysql fix 17