CB-2171: Patches are welcome.