Cherry-picking abe4a7a...