2105: Updated popcorn to respect our new wrapper