Revert "ROO-3341: Bad entity changes after field is added"

This reverts commit 3586aea693f27523764726b55a94165e6f76e90e.
ROO-3341: Bad entity changes after field is added