Revert "Patches: Add two more changes that aren't merged till now"

This reverts commit 1cd56553b6ab3ccfe555e9dc1c65637871982dde.