VID-1164 remove old border hack