restores old functionality using new format
fixes broken test