Revert "Merge branch 'master' into activities_checking"

This reverts commit 91db37b73c5ecda28dd80ebc449a97a45ebb89ba, reversing
changes made to 1fcb95f04df311cf5cca94a1b7de88238e7ceaab. The merge was
not don properly