Get rid of an unnecessary addition from f910611e.
Merge branch 'bugfixes'