This reverts commit c479c4f6d89ed7c5e33dd35a5e110f13776b7cab. 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.