reverting befc4cd and fa7016a since these has broken CApp functionality in ESB