Revert "Merge pull request #14831 from mpizza/Bug_937487_handle_activity"

This reverts commit 984223b294384d7c512755f395dc5f0bb9665455.