Revert 709d86a..a05897f

This rolls back to commit 709d86a4049281c613c62a858aa241336e2d9e1b.