Revert e2b569c..79d8b1a

This rolls back to commit e2b569caf409b04ab0e631b287f2433b5f140239.