Back out 30e935a33442 (bug 1064706, part 3), because it probably depends on part 2.

This reverts commit 0b3cc3d4acee2cf3ad7f3e2f578e20a802633969.
Back out afecbcdbe6d5 (bug 1064706 part 2) for leaking windows with e10s.