Remove TODO for #1548