Revert 5cd9af3..a9abe67

This rolls back to commit 5cd9af3117605df7e33ddd72b20ceb2e06f64a6e.