fixup previous commit to keep interacting correctly with upstream API