These changes that was merged in !3088 (merged) are somehow lost during recent merges. This MR fixes it.