Put a comment around this block - it wasn't part of the backport, was it?