Moved stiching conversion to get services from OSGI properly.