https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15191/diffs#8b7f3f630a603b3117ce59da0135cd98018d7027_32_59
Some empty states need to be updated to match that change