Revert 40a1eb8..e431c07

This rolls back to commit 40a1eb835c7439afddd54e1fb2ad3d36b8565716.