Revert "Merge branch 'ce-6983-promote-starting-a-gitlab-com-trial' into 'master'"

See merge request gitlab-org/gitlab-ce!22315