Revert "Revert "Revert "Patch to 1.0.9"""

This reverts commit 3274d4c73336169f4294b9e07ac63d9957541f6c.