Revert "Merge branch 'feature-activity-new-tab'"

This reverts commit 3d859c96341662b8b10eaa040e8c824a76d53cbd, reversing
changes made to fea80c017eff0d927e1a690b4053eb14e97804b8.