Argh, committed too much in the previous commit [ci skip]!