mpd: Not sure about this, commiting anyway.