Update patch to Entity API for less verbose logging in certain situations.