Reverted back due to issues with Maven deploy