Reapply r41578 with proper fix