Proximity fixup, govs, 4.4.4 commit