Note: Once this is fixed upstream then we can make the patch conditional
on the release source selection