Revert e6e161a..2206465

This rolls back to commit e6e161ab60cf53c51dd8fc0410f6311bd824f89a.