Revert "Merge pull request #834 from ldoktor/framework"

This reverts commit 3c2eb32e2d6616d0f772998a448e61f860e1a1e4, reversing
changes made to 7812b730b753d978dfb41a333d60af7a2b35beaf.