Synchronized with the source at 68879daae9cde977de620b386d77f005ffd662c1.