Synchronized with the source at 6d5d938901d20beae1f073f61507d8f1b588d140.