Revert Decoupling frameworks

Change-Id: I465f15de70c4a72745217bd9d66b2eff4ff8fec2