Revert "temporary workaround for today's null file bug."

This reverts commit 946011f1db995ee73794c6bfa2c40bf8628f960d.

Change-Id: If484ba4d0f3a54cb062b92bf8e04e9b2d252f5cb
Merge "Revert "temporary workaround for today's null file bug.""