Revert "Frameworks: Merge in Lots of Improvements from Vanir"

This reverts commit b5b2cd33ee7e8c74de186c8758c22d554efa6544.