Updated for 3.0.4 changes.