Synced with the source at 69ba67a4d0e17f91fd89d52d59b638431b22c1be .