Revert "Update roomservice dependencies for cm-12.0"

This reverts commit 4ea609dfeb95dab870c8c8ae36dc51fd99422538.