EntFix
Revert "EntFix"

This reverts commit 371aa58b3bca9eee339e47d4864e22634e056819.