FORGE-939 is fixed, this can be uncommented