partial restore for f3f17c12fb2584d5038025dc8503f1d88271e8cc