Revert "The autostart functionality now uses the Activitable class"

This reverts commit b67209093b6eb6ed682249b68b9a834e85255bab.