Revert +experiments +obsoletes patches