This gets us rid of a cyclic dependency loop. Closes: #12622 #12642 Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>