restoring the original api after legacy experiments