Restored workaround in utils. Needed for info url