Add PR to this FIXME, looks like I didn't commit this change after all.