Downgrade to 3.0.6-SNAPSHOT.

Fork has been rebased onto 3.0.x and will be merged
into 3.0.6-SNAPSHOT if accepted.