Revert "Fixed regression from a2dd618e3b4a7472fab852da450ca5eef92a922f."

This reverts commit 5a2556afb9b1b3ef6e0622552970c67ac84ecd28.
Fix a2dd618 for mysql.