Revert "Merge pull request #1621 from monarchdodra/undoHasElaborate"

This reverts commit 2f65b41d41328004f21e1047d85c055446d3285b, reversing
changes made to 561d266f485646ced9c0449a7a64fa16563dd3a6.
Fix pull #1598.
[Workaround] Disable some tests because of Issue 11202.

Issue URL: http://d.puremagic.com/issues/show_bug.cgi?id=11202
Merge pull request #1623 from denis-sh/fix-Issue-11108-again-fixup-pull-1598

Fix issue 11108 again (fixup pull #1598)