We are not not doing any real work here and it simplifies our code. In preparation of Bugzilla Id: 61176 (and github pr #298)