[#1871] Add import lost during bad merge