Revert "Update entity module"

This reverts commit 0ef7ac190740fac0f98f2637b1a42396033a3350.