Revert "support extended_entities."

This reverts commit 4fdafc7367ccc4107bbf9aba61c55e7aeb2039a6.