CB-7330 Fix dangling function call in last commit (broke gradle builds)