Revert "Fix ForEntities?"

This reverts commit 3456504e5d38e2da229b2bf72fd83d5fe7c0f018.
Fix ForEntities?