Revert c179f2e..eb8e6b8

This rolls back to commit c179f2eddecbb484ade99603c10f5ad37311909b.