WIP: Switch to vanilla version of "Support Hive" app