Revert to old version for now. The cost is too high for the improvements.