Revert "Frameworks: Merge a lot of improvements from VANIR"

This reverts commit 327206713ce446a2b9fcf23d6cd52b44d0fb3f3f.