There is a reason why this is delayed. While suboptimal and certainly should be configurable, it was a must for our test cases.