reverted breaking changes so the app works again