Revert "Merge pull request #17744 from ian-liu/system2/bug964653_system_dialog_refactor"

This reverts commit 09fe38e11a1979567838bfbadb5122af61ae8dcf, reversing
changes made to e9442b73fd5c01c366457b9a4d52387453615f1e.