I'll make sure I undo that part when we decide to merge this PR. I happened to copy over that commit from the other PR where this issue is being discussed. We haven't yet nailed down the fix for this specific issue although we have identified certain missing dependencies like the JPAService one.