bb7b2cdfd5
Revert regression introduced in refactoring for objectify
(cherry picked from commit 5bd7954)
Revert regression introduced in refactoring for objectify
(cherry picked from commit 5bd7954)