and when this is fixed (as mentioned in the comment) i believe it should fix both

needs-cherrypick

PRs which means i won't have lied when i said

rc2

would come out friday or monday