We should either remove the commented conditional or add a FIXME reference.