Modify for updates to 3.0.x branch.