Revert merge master into 2.2#1924

soyuka merged 2 commits intoapi-platform:2.2api-platform/core:2.2from

teohhanhui:revert-merge-master-into-2.2-no-rewriting-historyteohhanhui/api-platform-core:revert-merge-master-into-2.2-no-rewriting-historyCopy head branch name to clipboard