Revert "UP-4163 Fix maven build issues"

This reverts commit a8fe6d378fcfc1ef635f72c565361a9986ef276c.