rolled back popcorn hotfix