Revert "XAMEETINGS-52, XAMEETINGS-53"

This reverts commit 12dc97caace81ba088f3b52e96726cbfc90bbb38.