Revert a patch from luoxhu@linux.ibm.com