This reverts commit 31b0e34d1dd1226de1492101e3aeea60292196d7. The version numbers used in that commit were no improvement.