Looks like this might have been fixed in 17.2