Revert "Adjust roomservice for OSE-JFLTE"

This reverts commit 0db1d8880ef7f60f0f325e699a5eb1db9ba2bcd4.