Revert "Patches no longer required maybe!"

This reverts commit b903fb2d082bfeebc7b4eb55e499ed3ab809ed27.