Here we are going to wait until having Gene's patch ready :). So we could remove the workaround.