Revert "Fix overflow visibility logic"

This reverts commit 919296825af7c9028eac0f9c0be6d6c9fbda2184

Change-Id: Iba8cdc0f6d1023b12b7873314df13154f2cf265d