Revert "Revert "Patch to 1.0.9""

This reverts commit ffdf1d40d920b36a84fa002189cf7db649fdbf43.