Synchronized with the source at 525195ce44e8678279d08f7c4e894a0e9507909c.