Synchronized with the source at 55033e1de851c24b0706f56c7937c8d6e1816985.