trying to get tear-down-incremental to behave reasonably