Remove FIXME - if there's a better way to do this it isn't here.