WP-2827 Override the dang Panopoly Magic'ness