Synced with the source at 9e221ab7a21aabeccb4065563a50ac5ab6895448.