Revert 98a6037..eafd594

This rolls back to commit 98a60372d7d3add1623eda67d2bd355da72eda43.