This reintroduces the changes from 370d483 after they were probably accidentally removed in b3862e2.
370d483
b3862e2