Let's see how the pre21 changes works out.
Worth pointing out that, in 1.1.1 at least, generally you wanted to (and was usually possible for ~95% of PCs) complete this quest before ever entering the Pyramid. This was pretty useful, because it meant that you'd have access to the fireball wand for the fight with Rahetep.