Revert border tweaks for now.