Merge "Revert "Make object allocation entrypoints only take a class.""