patched up some cherrypick introduced brokenness