Minor followup to r61609