Fix badly-handled conflict
In resolving the conflicts in https://gitlab.com/gitlab-com/www-gitlab-com/merge_requests/3915, I overwrote some changes from https://gitlab.com/gitlab-com/www-gitlab-com/merge_requests/3735
This puts those back, and keeps the changes from !3915 (merged).