@ToddZ reminded me I forgot to update this topic.
That commit got reverted but then this PR fixed it for good