Revert "dh's commit"

This reverts commit 1cf30c585e987b7f31a4381206342417b5084d99.