See check-in [5d16ca43f192].