Revert "patching upstream to 3.0.17"

This reverts commit 59bd992d99d3a57c2ec142fafe991be0e104fdfb.
patching upstream to 3.0.17