am 9d8a230f: Revert "View measurement optimization"

* commit '9d8a230fbd71ac57ef806326f15fa133ba125083':
  Revert "View measurement optimization"