Synchronized with the source at b50dd55ad43df321d6825bb7b4cbf27a3b471b96.