Revert "Fix measurement of QS Tiles and revamp landscape handling"

This reverts commit 95ee928bc532d9582b39afa03812c68d869785e0.