See check-ins [dad7731f0e] and [c6a9e4ed41].