
This reverts commit 55772d45005910e6764c0b457e840f1cc85f1f71. Reason for revert: Brought to my attention that this is way too broad. Agree. Change-Id: I3e2fec355960844d2af8af3212780245fc53d66b (cherry picked from commit 5cd03a02dcc34e31fe40c15ec9c7217b66089234)