This reverts commit e383c5fca0. Reason for revert: want to add one more check Change-Id: I02b621d0c98b9000f75ea214cf5b4967cfaee95d
e383c5fca0