Revert "BORDER"

This reverts commit 7caaba2c7a4c1fd994df6600c5b28eb21b25e685.