Built from revision b7b4d513fe2a73c4a2c198721e0e6ce269efdda5.