This reverts commit b64b87ad. The crossings already have buffering in those places where it was appropriate. Adding more does not help flow through paths.