Revert "Fix for ambiguous and broken disk formatting dialog"

This reverts commit 21b9406c8b84a155784a9db162952edc7f8fc0cb.