WP-2719: Fix the panopoly_magic bug properly.