Revert " - merging in the patched files"

This reverts commit 4291a022f19eaa2591576d836497f15c9db45812.

Merged from 3.7.0 instead of 3.7.2