Removed app-edition workaround