This reverts commit 4a9c42be, which may have silenced a warning, but broke VPIC to do so. Fixes for whatever the warning was will follow, once the dashboard shows them to me.

Change-Id: I02e183e9ddab63791123c66fcd652de00224b1ec