Revert 2c2aefd..465aa68

This rolls back to commit 2c2aefdcd96d90535c8e101c93207e44d1d856ee.
1.0.9