Revert "ASDK-161"

This reverts commit 805523dcfb91eb657e8d5336cffb64278bd58631.
Revert "ASDK-161"

This reverts commit ddbacfb32f2f9fce2b6ea1591e08890a175e207a.

Conflicts:
	pom.xml