Restores accidental reversion of commit 9413c64 introduced by commit 91d6a39.