Revert e69402f..6a22730

This rolls back to commit e69402f85dab8c7fa61bd23832bcda43c962354d.