reverting r 180708

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@180733 a5903396-d722-0410-b921-86c7d4935375
reverting r 180710

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@180734 a5903396-d722-0410-b921-86c7d4935375
reverting r 180717

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@180735 a5903396-d722-0410-b921-86c7d4935375