Can we cherry pick this commit? We definitely want this part, for example.