#36642 remove endpoint property cause it is not needed in this case