bug-58299

bryan davis found the possible source of Bug: 58299.

Change-Id: I228d225c819d9844e020d70259c879080ad97af0