Revert "updating mysql files"

This commit fixed the mysql files as used in packages,
but broke dev-helper based installs.

Reverting so change can be included in dev/issue-7072-upgrade branch

This reverts commit 327f735528d2eb4d6c72dfe45c041fe8bddcc7e0.