Followup to b520a4930a6292e4521cd25b13c57658c90911f8