Synchronized with the source at 2496169c32e5992791680af9eca019318a5f3f12.