Move some stuff back to HostedFFA