Follow-up on r49330