Revert "Cleanup"
Revert "Cleanup"

This reverts commit 7fa771e0f37d4a081888dbe7037a1466c8a24a01.

Should have been on a branch.

ollie314/server,natsys/mariadb_10.2,kuszmaul/PerconaFT,flynn1973/mariadb-aix,ottok/PerconaFT,natsys/mariadb_10.2,kuszmaul/PerconaFT-tmp,kuszmaul/PerconaFT-tmp,flynn1973/mariadb-aix,davidl-zend/zenddbi,natsys/mariadb_10.2,ollie314/server,davidl-zend/zenddbi,ottok/PerconaFT,ollie314/server,natsys/mariadb_10.2,davidl-zend/zenddbi,ollie314/server,kuszmaul/PerconaFT,kuszmaul/PerconaFT,kuszmaul/PerconaFT-tmp,ollie314/server,flynn1973/mariadb-aix,flynn1973/mariadb-aix,BohuTANG/ft-index,kuszmaul/PerconaFT,natsys/mariadb_10.2,natsys/mariadb_10.2,ollie314/server,ollie314/server,ottok/PerconaFT,natsys/mariadb_10.2,ollie314/server,davidl-zend/zenddbi,davidl-zend/zenddbi,flynn1973/mariadb-aix,kuszmaul/PerconaFT-tmp,davidl-zend/zenddbi,davidl-zend/zenddbi,davidl-zend/zenddbi,flynn1973/mariadb-aix,natsys/mariadb_10.2,davidl-zend/zenddbi,flynn1973/mariadb-aix,BohuTANG/ft-index,flynn1973/mariadb-aix,ollie314/server,percona/PerconaFT,flynn1973/mariadb-aix,percona/PerconaFT,BohuTANG/ft-index,davidl-zend/zenddbi,flynn1973/mariadb-aix,natsys/mariadb_10.2,flynn1973/mariadb-aix,natsys/mariadb_10.2,percona/PerconaFT,percona/PerconaFT,slanterns/server,natsys/mariadb_10.2,BohuTANG/ft-index,davidl-zend/zenddbi,ollie314/server,ollie314/server,ottok/PerconaFT