Revert 68a8b8f..59c62c2

This rolls back to commit 68a8b8f72d3ee717e8eaddb9afed8ec1a44babd8.