restore old code until I get hybrid applications right