Also check-in [ab99faca6c].