Synchronized with the source at d4fae7ae0b9c7e56dc9350e4f6781645404a5fbe.