Back out Merge pull request #630 from ZER0/window.tabs/bug804935 for causing debug failures.

This reverts commit f2c93bd8cac8c48ff11f6ae2f4ce84d99e037ded, reversing
changes made to b205f229a706aa8d8c622d4a3cacda5e0705e5ed.