am: 8559bbfb -s ours * commit '8559bbfb': DO NOT MERGE ANYWHERE Use synchronous writes when setting up BCB.