Also drops the old mddi structure, which conflicts with the new
file.
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>