Fix merge of commit 4a0b9981513059755b9fd15b38fc198f46a0d6f2.