Short answer is yes.
Longer answer:
1. you need to clip the zip ties holding things to the top of the fan shroud above the radiator and move those things back over the top of the engine
2. break the fan nut loose but don't undo it all the way. See
http://www.beesvillebeefarm.com/jeep.html for how to hold the fan base in place with an allen wrench or use a long socket on the same nut.
3. there are 2 bolts (1 on each side and 10mm IIRC) down on the side that hold the shroud. FYI the nuts are partially captured and easy to lose. I used zip ties to fully capture them. Be sure not to mix up bolts as the length of these bolts is critical; substitute too long ones will puncture the radiator. Note also the lower fan shroud clips that need attention on reinstall. Undo the bolts.
4. place a piece of cardboard (preferred) or a towel in front of the fan to protect the radiator and complete undoing the fan nut.
5. remove the fan and shroud together. The shroud will need to be tilted right and then left to get the bolt tabs past obstructions.
6. I strongly recomend a fan shroud mod (pick from
viewtopic.php?f=98&t=64278&p=709322#p709322) to make future access easier
7. get a Hayden heavy duty fan clutch to replace the OEM one.