Yeah.
This code and fixme we should have removed a long time ago ...