Revert "Added patches from git request:"

This reverts commit 0d2d0f076ed9d25707c4e85a274e7080a9fb54fa.