Avoid extra parsing on edit

bug: 57026
Change-Id: I0782ea669b431697d6c76be945c93d3e2f30f3cf