Revert what is left of r240427

Ease the work of this branch by changing the write membar
into just a membar.