I did this commit in an earlier revision of my pull request. As
reverting this commit later caused failing tests I decided to
include it again.