Partially revert last patch.