Revert "Update entity for Mill"

This reverts commit e16df4c75ab42a23f568032d00094fbc69cc8581.