Update to represent @3dd29ed778