Fixed issue with patch ordering after backport of patch.