It just keeps getting worse. Turns out we also have to update the borders for our borders!