Issue #2363211: Avoid possible entity_load problems by talking directly to the db in update functions