Revert "Merge branch 'bugfix-13510' into develop"

This reverts commit 5164160f59bf6663c9e7f3d909922dd8b442a945, reversing
changes made to 6a7ab1d9cd03dd5b7e3a5adb1c583e3fdafce9d3.