Revert r42723. Inactive borders are drawn properly again.