Merge "blind writes" workaround from release into master

We're going to turn around and revert this in master right away, but we need the commit merged back into master first so future merges back from release don't cause confusion.