You will see we have started on the 6th fairway bunker to move it slightly away from the water’s edge. When you need to drop out of the water you will be able to drop on the grass bank and not back into the bunker.
Also, the bank next to the water is being made higher making it less likely that your ball will run through the bunker.
With these changes the rule as to where you should take a drop will be easier to determine.