Revert "Merge from MySQL branch"

This reverts commit fd31b89b2ca76a94db0dba81038bc6f8d1f17c30, reversing
changes made to 10fbb2f55cd6cb70dfef3d2613a6c47b39969045.