Revert Decoupling frameworks

Change-Id: I20ddf237311958fa66629b85e700ef1a1f280585