Bug #3357 - Revert the reversion

This reverts commit f2c9c8c3a3d6399c6cae320b1336e05db1a5e1af.
Bug #3357 - Add a Popcorn() shim for old projects