Revert c1ec9b6..9bfe158

This rolls back to commit c1ec9b66fb12598ea9804a87a282e41c1e84e073.