Revert e09b701..710fe44

This rolls back to commit e09b70145d9fcc4a9c43d5716274704e829a209f.