Revert "Pointed all entity functions to NativeUtil"

This reverts commit 53fda4eb34961a9d6d025dd21a7319f1cf93a5f1.