Revert "Fix failing defaultinittestcase"

This reverts commit d08e392e9a354cd2f2c58c7ec0e81df521812de8.
6 files changed