Revert "Fix for https://github.com/wso2/api-manager/issues/2226"#2258