Revert "borders: cartier style framing"

This reverts commit 54a4c60b12bb3d44fe32147616d9b0681df3c3f0.

Whoops string freeze :( Reapply after release...