Commit from JBoss Tools
Refactoring by removing service path.