Linker part of PR16563 fix