This aligns with commit b8665828cc76730a85e9405526ad820f97a240db inside the main tree. Signed-off-by: Nils Freydank <nils.freydank@posteo.de>