This reverts commit 071fe092.
It was committed by a mistake and correct patch was committed
earlier as baad90fb.