See check-ins [2664476fbc] and [6eddf50cfe].