Revert "an advice from Dave Cheney"

This reverts commit 4effa212ac366fb26953572c9732739427b6645b.