Doing that will just pospone and possibly make us forget a problem. This PR is about a UT issue. As such, let's take the time and fix it properly - not make the problem worse.