Synchronized with the source at 1fce020e3b7181ff2b8c4e38e0d6d9e6c9616363.