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