Revert "apply hvr's patch"

This reverts commit a09cf3d1e6bbebdc2ad53561b0acd51d2283047e.