Revert "refctor so EndPointPath and Tostring share same code"

This reverts commit 0332023558d7181177699920b38c284ea934fc8c.