revert r147542 after comments from Joerg Sonnenberger