Fix incorrect merge of '1016795b404ffa0d12a817e68725268f70fb756e'