Revert "Fixes product-ei/issues/415"
Revert "Fixes product-ei/issues/415"

wso2/product-ei,milindaperera/product-ei,wso2/product-ei,wso2/product-ei,milindaperera/product-ei,wso2/product-ei,wso2/product-ei,milindaperera/product-ei,milindaperera/product-ei,milindaperera/product-ei