Revert "Revert 8391a28..8098451"

This reverts commit c217f34807886eee19375bd3808e618103a76d95.