BETA: Partially reverted "Heal to Effects" changesets (will be done more complete way someday), others minor things will be reverted later (if some issues are detected/reported).