This reverts commit c479c4f6d8. The problem related with no changes on the ShapeHealing stage. ReShape do not propagated well for all scenarios. The test case update is not relevant.
c479c4f6d8