3953 is fixed, we can update this TODO