Updated by Tom Clegg about 8 years ago
This ensures proper semantics even before #8470 is done.
Back