Fixes #83065634, clean up read logic to remove race conditions

Signed-off-by: Mike Gehard <mgehard@pivotal.io>