Revert e814f0e..dd508fd

This rolls back to commit e814f0e7bf8e8df4ff6d037b409ea1ca830f3175.