Revert "Match Window"

This reverts commit 59a74f74e075468d2595cdd9c3fbec63047ed9e6.