reopens #10265352272514