Revert mtd changes

Change-Id: I3db865b8c22c8c652b8e23e35dbf0f9593b7d0ac