Reverted to the Mms version

Signed-off-by: svenake <svenake@gmail.com>