Revert previous commit since it breaks persistence with entities.