Hi Wei Li,
I am suggesting before we remove we try to see if it is not possible to be fixed by changing the metric. However, you are correct the easy/fast path is replace all that is not using the endpoint for thee up/side down.