Revert "Fixes errors caused by extra ents"

This reverts commit d068c40e0b4bceab46c86983a6105aefe46c76b2.