[PATCH] MD: conditionalize some code