Revert 98c4d00..89ed3f0

This rolls back to commit 98c4d00f52cb2b8763b348cd11ab334ddfea9691.