Revert "Merge branch 'fix-inconsistent-cancel-button' into 'master'"
What does this MR do?
Revert https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20140.
Why was this MR needed?
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20140#note_87070967