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