Revert "Merge branch 'cherry-pick-66f449e1' into 'release/0.13'"

This reverts merge request !98
9 jobs for revert-4cf93a5a in 3 minutes and 23 seconds (queued for 1 second)