Reverted change that broke gradle test