Hm, this blurs history a little, please do not do unrelated changes in commits. Separate commit, please.