Merge "Revert "Freezing face api"" into main