Found and fixed a few corner cases where triangulation point removal could reset expected points (cherry picked from commit 553e4a25bf)
553e4a25bf