This partially reverts commit bac8bc569c and fixes nr_dlschsim, which did not compile without this commit.
bac8bc569c