Revert 70a8126..c8db556

This rolls back to commit 70a81267311d38e9906fedd674abdee89dfb110d.