partially revert cel web_service (broken)
Merge branch '4728-cel-webservice'