macosx: revert recent wizard optimizations, since these led to undefined...

macosx: revert recent wizard optimizations, since these led to undefined results with this unmaintanable code (close #7334)

This commit is part of the stable branch only, since the wizard will be removed for 2.1.