This reverts commit 6a9327f2ab. The real fix for this (and other issues) needs to be done in dtcodegen.
6a9327f2ab