Tool Labs: Revert, mc was already there!

Change-Id: I26b35d2d42f950a7bd110f89c4ba89140780c37f