revert all mdp and fb changes

Change-Id: I03da7870a040c170aea19d1b4a3580bf7956d01e