Revert 2fe0453..2170520

This rolls back to commit 2fe04535aa2da65f900fd78c0f5fb882b427d427.