Revert "Merge branch 'ajk-relative-positioning-improvements' into 'master'"

See merge request gitlab-org/gitlab!39787