Revert c34a7ee..6d7305b

This rolls back to commit c34a7ee5d1c8e69a45110ea7d9aa6d2c3b0d7d9f.