Redo r144538 (after r144530).