Revert "Add entityType to context"

This reverts commit 598bddb382b97a402249123b266f9b74ae765020.