Revert "Merge branch 'bugfix-12708' into develop"

This reverts commit a9574c0c7c8cbf632750b6d015962ed88abc9850, reversing
changes made to 200c096cf4d7bede3e32390ae4997d9809dc96a3.
Revert "Merge pull request #872 from runrevsebastien/bugfix-12708"

This reverts commit 391b48f67a92283a10dc96f87b1d34386fd8a91a, reversing
changes made to 55ddbd7abc04bccb46b1f03b7a016ee20f43007b.
[[ Bug 12708 ]] Make sure clicks in popup windows don't cancel popup windows.
Merge branch 'bugfix-12708_redux' into develop