Revert some changes to Entity acceleration