Merge pull request #571 from lburgazzoli/remove-mp-config-workaround

Remove mp-config workaround