Revert 0896b1e..6228b69

This rolls back to commit 0896b1e7de8f8c86455723c43e7ba50d28ac87f5.