Revert "Merge pull request #698 from Gozala/bug/addon-window@820953"

This reverts commit 42cede06862471f3c05cb937cb3d2200b4d3218e, reversing
changes made to 0a7815dcad63db787ca542e648eeb29c2d8f5390.