(ENTERPISE-258) Fix conflict with pe_staging.