Revert "ScanPopup Update"

This reverts commit e6d9cbd06f9a68ac875ab5779e4e7ae5c3e373e2.