Revert Decoupling frameworks

Change-Id: I1c62a4c2bef178f29db3ea61268e97239fd3c631