This reverts commit 3655f075. It caused assertion failures related to setLastUser in polly builds.
mentioned in commit 3ee82659