WP-3038: Temporarily revert changes, they broke panelizer.