Revert "this requires string literals now" and "fix after recent XSERVICEINFO_IMPL_1 change". This reverts commits f7d571d2 and 186ab8e7.