Synchronized with the source at efc1a4194b17f99b4ddede73a7d3429f79c408f4.