Revert to our previous version, which is newer that the one in MC. Also add the NO_STAGE add while here fix the lib_depends to the new style