Revert "Last App Toggle [2/2]"

This reverts commit 5fe930c8e0a25e32daa093c83379b1ceb868d612.