One last attempt.

Add the mp code. But it helpeth not. With luck we just
remove it again later, but now we can hack.

Signed-off-by: Ronald G. Minnich <rminnich@google.com>