Rollbacking contentMacro for the @touch:Dialog

contentMacro is still the only way to specify a macro in the @touch:Dialog.