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

This reverts commit 7d2d1010f58b8495fdc0108de430aed90f305afb, reversing
changes made to 71c62c03a017b66049ddf77418d1dc8098886d74.