In master, reverting the 'blind write' workaround that we put into the release branch for release 36