Revert "[PIA] add missing flag checks"

This reverts commit 4a9ad35690d150fde88efbf62c252cd70ae5767e.

Reason for revert: investigating test failures

Change-Id: I09d0f919557433ec4f56ab0a8ad2da1d3d2dccf6
3 files changed