Revert "Merge branch 'jc/remove-cherry-pick-ff' into 'master'"
This reverts commit acfe013b, reversing changes made to 023c2a7d.
cherry pick was causing intermittent errors in e2e tests: gitlab#421712 (closed) so reverting to give time to investigate.
Edited by John Cai