the amount of code required for the new vs old dialog is amusing

Change-Id: I7feee572eecd94fab3e8c2210755b70832cbd2f2