See check-in [e70160a9be].