Revert: Flush after populating entity (5d731e7015098887bcebc33e5d0d11b776ab2a75)