Erase border that appears with TMP (#528)

I've checked conflict as much as possible, but I'm afraid my oversights.