Revert e0288a9..f0bc967

This rolls back to commit e0288a9762f022829bac40f01fd976f390d15b19.