Re-land Bert's test for #1697
Re-land Bert's test for #1697

Was reverted out in cde81a6675caa5d64d2215b75105cf353ed98dc6

dreamllq/node,dreamllq/node,dreamllq/node,dreamllq/node,dreamllq/node,dreamllq/node,dreamllq/node,dreamllq/node,dreamllq/node