Revert "TEMPORARY patch to help find the source of warnings in production"

This reverts commit 3354c97802bba6480fc61bfd0c02205f57f15c12

Change-Id: I2838998d2b9e2fbf5b28801306dad2d6b591a54b
Merge "Revert "TEMPORARY patch to help find the source of warnings in production""