changelog: Unmerge changes from 0.0.3 and 0.0.4