Fixes wrong additional code introduced in merge commit 62b06be4c49bc6e300f8c7c8d8783c003cd6ccdb