This reverts commit 5dd91d698b. Reason for revert: Catch2 test fails Change-Id: If0ea0eab16b50f27c9acbc471530266917773ff1
5dd91d698b