Received reports of unexpected roster caching caused by this change (not
verified). Additional investigation is needed to determine whether/how
to fix original issue reported via OF-473.