This branch originally started out as a potential workaround to
address #11450. It did not solve that problem, however, it did end
up fixing #11498!