Revert "Fix: Fix for ambiguous and broken disk formatting dialog"

This reverts commit d6cad1af10755de1d680376aea6720528c484250.

Change-Id: I451eca551fe900720b61a8cb3eb6ae41f80511f2