disable this code for now, re-breaking PR2975, but fixing