Synchronized with the source at 652a2a8cf77705f13785995498c28dd4ad81ffe7.