Revert "Frameworks: derp"

This reverts commit c7d2e20637a1d842fec1de8b3e4708ab6e663c7a.

Change-Id: I7dc15375ea988f240eab6443b17440fa8aae5ef4