Revert "Merge branch 'fix/missing-border' into 'master'" See merge request gitlab-org/gitlab-ce!26980