Partially revert commit adcebf