Revert to fully working frameworks base

Change-Id: I9a34c370f8b6c72a279578d2faa9e3edb9654544