Revert e7baeb8..20ea3f3

This rolls back to commit e7baeb8fdb73751176be4d5afe024bd9459fe966.