Merge "Revert "Fix the API for new flatbuffer""