Move to simple utility class instead of leaving in the FIXME.