With the last "find" call to determine inputs removed, this should
hopefully work reliably now.

Change-Id: Ie725e29d0889ec40cefc961ff61b2cf29839fb66