reintegrate activity store bugfix

This reverts commit 5ca1976cfbe62b904e01b3a07683fc94d0cfb70c.