Synced with the source at ba25d1a597c46158fc2fd9b918720a9330375c84.