Revert "Fixing https://issues.apache.org/jira/browse/STRATOS-655"

This reverts commit 631b0b7b30c6b6df8a156258cb973ce34908231f.