We should not need that recurse anyway. Change-Id: I504b52a2bb3c89e75ac3402f259c317889c054e6 Closes-Bug: #1794251