Synchronized with the source at 4239efe4f2dff88a3aad628f1a9e4c1aaa3a90da.