so, shipit on #4441 ... but might be good to think of that one as a blocker for enabling by default