Revert e4e914c..4203498

This rolls back to commit e4e914cd25ad6c7329a39c6a48a04951c951311b.